label_xalign and label_yalign need to be float properties to correspond to

Mon Nov 19 12:28:02 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkframe.c (gtk_frame_class_init): label_xalign
	and label_yalign need to be float properties to
	correspond to GTK+-1.2, to gtk_frame_set_label_align,
	and to the types of the xalign and yalign properties of GtkMisc.
	(#63484, Vitaly Tishkov)

Mon Nov 19 12:24:30 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtksocket.h (struct _GtkSocketClass): Fix return
	of plug_added vfunc. (#64408, Jeff Franks)

diff --git a/ChangeLog b/ChangeLog
index 54c8703097e86cbaad6ca59298c1cbb5bc5088ec..da4c6f46eb10bb93dab9dfaf3530783a399d61ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Nov 19 12:28:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkframe.c (gtk_frame_class_init): label_xalign
+       and label_yalign need to be float properties to
+       correspond to GTK+-1.2, to gtk_frame_set_label_align,
+       and to the types of the xalign and yalign properties of GtkMisc.
+       (#63484, Vitaly Tishkov)
+
 Mon Nov 19 12:24:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 54c8703097e86cbaad6ca59298c1cbb5bc5088ec..da4c6f46eb10bb93dab9dfaf3530783a399d61ae 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Mon Nov 19 12:28:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkframe.c (gtk_frame_class_init): label_xalign
+       and label_yalign need to be float properties to
+       correspond to GTK+-1.2, to gtk_frame_set_label_align,
+       and to the types of the xalign and yalign properties of GtkMisc.
+       (#63484, Vitaly Tishkov)
+
 Mon Nov 19 12:24:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 54c8703097e86cbaad6ca59298c1cbb5bc5088ec..da4c6f46eb10bb93dab9dfaf3530783a399d61ae 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Mon Nov 19 12:28:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkframe.c (gtk_frame_class_init): label_xalign
+       and label_yalign need to be float properties to
+       correspond to GTK+-1.2, to gtk_frame_set_label_align,
+       and to the types of the xalign and yalign properties of GtkMisc.
+       (#63484, Vitaly Tishkov)
+
 Mon Nov 19 12:24:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 54c8703097e86cbaad6ca59298c1cbb5bc5088ec..da4c6f46eb10bb93dab9dfaf3530783a399d61ae 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Mon Nov 19 12:28:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkframe.c (gtk_frame_class_init): label_xalign
+       and label_yalign need to be float properties to
+       correspond to GTK+-1.2, to gtk_frame_set_label_align,
+       and to the types of the xalign and yalign properties of GtkMisc.
+       (#63484, Vitaly Tishkov)
+
 Mon Nov 19 12:24:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 54c8703097e86cbaad6ca59298c1cbb5bc5088ec..da4c6f46eb10bb93dab9dfaf3530783a399d61ae 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Mon Nov 19 12:28:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkframe.c (gtk_frame_class_init): label_xalign
+       and label_yalign need to be float properties to
+       correspond to GTK+-1.2, to gtk_frame_set_label_align,
+       and to the types of the xalign and yalign properties of GtkMisc.
+       (#63484, Vitaly Tishkov)
+
 Mon Nov 19 12:24:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 54c8703097e86cbaad6ca59298c1cbb5bc5088ec..da4c6f46eb10bb93dab9dfaf3530783a399d61ae 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Mon Nov 19 12:28:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkframe.c (gtk_frame_class_init): label_xalign
+       and label_yalign need to be float properties to
+       correspond to GTK+-1.2, to gtk_frame_set_label_align,
+       and to the types of the xalign and yalign properties of GtkMisc.
+       (#63484, Vitaly Tishkov)
+
 Mon Nov 19 12:24:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 54c8703097e86cbaad6ca59298c1cbb5bc5088ec..da4c6f46eb10bb93dab9dfaf3530783a399d61ae 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Mon Nov 19 12:28:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkframe.c (gtk_frame_class_init): label_xalign
+       and label_yalign need to be float properties to
+       correspond to GTK+-1.2, to gtk_frame_set_label_align,
+       and to the types of the xalign and yalign properties of GtkMisc.
+       (#63484, Vitaly Tishkov)
+
 Mon Nov 19 12:24:30 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtksocket.h (struct _GtkSocketClass): Fix return

diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 95287ae2dd4df4a2be7ed7840667de6fcf82b2f2..c2b0b6cc8693ea74c8c6a7b9a611e63747ac4a30 100644 (file)
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -129,24 +129,24 @@ gtk_frame_class_init (GtkFrameClass *class)
                                                        G_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                   PROP_LABEL_XALIGN,
-                                  g_param_spec_double ("label_xalign",
-                                                        _("Label xalign"),
-                                                        _("The horizontal alignment of the label."),
-                                                        0.0,
-                                                        1.0,
-                                                        0.5,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                  g_param_spec_float ("label_xalign",
+                                                      _("Label xalign"),
+                                                      _("The horizontal alignment of the label."),
+                                                      0.0,
+                                                      1.0,
+                                                      0.5,
+                                                      G_PARAM_READABLE |
+                                                      G_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                   PROP_LABEL_YALIGN,
-                                  g_param_spec_double ("label_yalign",
-                                                        _("Label yalign"),
-                                                        _("The vertical alignment of the label."),
-                                                        0.0,
-                                                        1.0,
-                                                        0.5,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                  g_param_spec_float ("label_yalign",
+                                                      _("Label yalign"),
+                                                      _("The vertical alignment of the label."),
+                                                      0.0,
+                                                      1.0,
+                                                      0.5,
+                                                      G_PARAM_READABLE |
+                                                      G_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_SHADOW,
                                    g_param_spec_enum ("shadow", NULL,
@@ -206,12 +206,12 @@ gtk_frame_set_property (GObject         *object,
       gtk_frame_set_label (frame, g_value_get_string (value));
       break;
     case PROP_LABEL_XALIGN:
-      gtk_frame_set_label_align (frame, g_value_get_double (value), 
+      gtk_frame_set_label_align (frame, g_value_get_float (value), 
                                 frame->label_yalign);
       break;
     case PROP_LABEL_YALIGN:
       gtk_frame_set_label_align (frame, frame->label_xalign, 
-                                g_value_get_double (value));
+                                g_value_get_float (value));
       break;
     case PROP_SHADOW:
     case PROP_SHADOW_TYPE:
@@ -242,10 +242,10 @@ gtk_frame_get_property (GObject         *object,
       g_value_set_string (value, gtk_frame_get_label (frame));
       break;
     case PROP_LABEL_XALIGN:
-      g_value_set_double (value, frame->label_xalign);
+      g_value_set_float (value, frame->label_xalign);
       break;
     case PROP_LABEL_YALIGN:
-      g_value_set_double (value, frame->label_yalign);
+      g_value_set_float (value, frame->label_yalign);
       break;
     case PROP_SHADOW:
     case PROP_SHADOW_TYPE:

diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index 14ee4165a13637d653c11aaf0720e2689b0e1269..842acb605d9cca8598a2151a8dc20c6fe5d798df 100644 (file)
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -71,7 +71,7 @@ struct _GtkSocketClass
 {
   GtkContainerClass parent_class;
 
-  gboolean (*plug_added)   (GtkSocket *socket);
+  void     (*plug_added)   (GtkSocket *socket);
   gboolean (*plug_removed) (GtkSocket *socket);
 };